GtkThemingEngine: Add progress arg to gtk_theming_engine_is_state_set()
authorCarlos Garnacho <carlosg@gnome.org>
Thu, 19 Aug 2010 20:45:22 +0000 (22:45 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Sat, 4 Dec 2010 14:38:09 +0000 (15:38 +0100)
gtk/gtkthemingengine.c
gtk/gtkthemingengine.h

index b29c73db4781d2e57bee204894f37acfa4b620ac..8797ff898ef86e3acc67e5a42bf4ba0172c0de2d 100644 (file)
@@ -314,14 +314,15 @@ gtk_theming_engine_get_state (GtkThemingEngine *engine)
 
 gboolean
 gtk_theming_engine_is_state_set (GtkThemingEngine *engine,
-                                 GtkStateType      state)
+                                 GtkStateType      state,
+                                 gdouble          *progress)
 {
   GtkThemingEnginePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), 0);
 
   priv = engine->priv;
-  return gtk_style_context_is_state_set (priv->context, state, NULL);
+  return gtk_style_context_is_state_set (priv->context, state, progress);
 }
 
 G_CONST_RETURN GtkWidgetPath *
@@ -558,7 +559,7 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
   else
     gdk_cairo_set_source_color (cr, text_color);
 
-  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT))
+  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT, NULL))
     {
       int line_thickness = MAX (1, (3 + interior_size * 2) / 7);
 
@@ -569,7 +570,7 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
                       line_thickness);
       cairo_fill (cr);
     }
-  else if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE))
+  else if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE, NULL))
     {
       cairo_translate (cr,
                       x + pad, y + pad);
@@ -670,7 +671,7 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
   /* FIXME: thickness */
   thickness = 1;
 
-  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT))
+  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT, NULL))
     {
       gint line_thickness;
 
@@ -692,7 +693,7 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
                       line_thickness);
       cairo_fill (cr);
     }
-  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE))
+  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE, NULL))
     {
       pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9);
       interior_size = MAX (1, exterior_size - 2 * pad);
@@ -1481,7 +1482,7 @@ gtk_theming_engine_render_layout (GtkThemingEngine *engine,
 
   screen = gtk_theming_engine_get_screen (engine);
 
-  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INSENSITIVE))
+  if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INSENSITIVE, NULL))
     {
       PangoLayout *insensitive_layout;
 
index 326fc63db4a2888d66c4053811cbad44606f8831..e315e0a01f50534433fa14a102aca10e9bab6f93 100644 (file)
@@ -175,7 +175,8 @@ gboolean gtk_theming_engine_has_region (GtkThemingEngine *engine,
 
 GtkStateFlags gtk_theming_engine_get_state     (GtkThemingEngine *engine);
 gboolean      gtk_theming_engine_is_state_set  (GtkThemingEngine *engine,
-                                                GtkStateType      state);
+                                                GtkStateType      state,
+                                                gdouble          *progress);
 
 GtkTextDirection gtk_theming_engine_get_direction (GtkThemingEngine *engine);